Merge branch 'deb/emacs23/d/sid/upstream' into deb/emacs23/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Thu, 30 Jul 2009 01:14:35 +0000 (20:14 -0500)
committerRob Browning <rlb@defaultvalue.org>
Thu, 30 Jul 2009 01:14:35 +0000 (20:14 -0500)

Trivial merge